Fixes #20560: Fix VLAN disambiguation in prefix bulk import#20937
Merged
Fixes #20560: Fix VLAN disambiguation in prefix bulk import#20937
Conversation
jnovinger
requested review from
a team and
bctiemann
and removed request for
a team
bctiemann
approved these changes
Dec 12, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes: #20560
When
vlan_siteis specified during prefix bulk import, the form should only match VLANs at that specific site. The previous implementation included VLANs withNULLsite (global VLANs), which caused "multiple objects were found" errors when both a global VLAN and site-specific VLAN existed with the same vid.PrefixImportForm.__init__vlan_sitefield but inadvertently carried forward the NULL inclusion bug